Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 8 Apr 2012 07:00:32 +0000 (00:00 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 8 Apr 2012 07:00:32 +0000 (00:00 -0700)

Trivial merge